diff --git a/tufte-handout.cls b/tufte-handout.cls
index 88f1a56..d14512b 100644
--- a/tufte-handout.cls
+++ b/tufte-handout.cls
@@ -262,22 +262,11 @@
 % keep the float (figure and table) numbers in sequence.
 \RequirePackage{placeins}
 
-%%
-% Margin figure
-
-\newcommand{\marginfigure}[2]%
-  [-1.2ex]%
-  {\FloatBarrier% process all floats before this point so the figure numbers stay in order.
-   \marginpar{\@tufteh@marginfont
-              \def\@captype{figure}
-              \vspace*{#1}
-              \@tufteh@raggedright #2}}
-
 %%
 % Margin figure environment
 
 \newsavebox{\@tufteh@marginfigbox}
-\newenvironment{marginfig}[1]
+\newenvironment{marginfigure}[1]
     [-1.2ex]
     {\FloatBarrier% process all floats before this point so the figure numbers stay in order.
     \begin{lrbox}{\@tufteh@marginfigbox}
@@ -292,22 +281,10 @@
      \marginpar{\usebox{\@tufteh@marginfigbox}}}
 
 
-%%
-% Margin table
-
-\newcommand{\margintable}[2]%
-  [-1.2ex]%
-  {\FloatBarrier% process all floats before this point so the table numbers stay in order.
-   \marginpar{\@tufteh@marginfont
-              \def\@captype{table}
-              \vspace*{#1}
-              \@tufteh@raggedright #2}}
-
-
 %%
 % Margin table environment
 \newsavebox{\@tufteh@margintablebox}
-\newenvironment{margintab}[1]
+\newenvironment{margintable}[1]
    [-1.2ex]
    {\FloatBarrier% process all floats before this point so the figure numbers stay in order.
    \begin{lrbox}{\@tufteh@margintablebox}