diff --git a/LuaUUThesis.cls b/LuaUUThesis.cls
index a3b84b9..951134f 100644
--- a/LuaUUThesis.cls
+++ b/LuaUUThesis.cls
@@ -161,9 +161,6 @@
 \DeclareOption{openright}{ \@UU@openrighttrue }
 
 \PassOptionsToPackage{figuresright}{rotating}
-% added compatibility=false to make it work together with subcaption
-% https://tex.stackexchange.com/questions/31906/subcaption-package-compatibility-issue#31927
-\PassOptionsToPackage{font=small,labelfont=bf,nooneline,textfont=it,compatibility=false}{caption}
 
 \ProcessOptions
 
@@ -614,48 +611,6 @@
 \setlength{\abovecaptionskip}{3pt plus 2pt}
 \setlength{\belowcaptionskip}{0pt plus 42pt}
 
-\AtBeginDocument{
-	\def\@caption#1[#2]#3{%
-		\par %
-		\addcontentsline {\csname ext@#1\endcsname }{#1}{\protect \numberline {\csname the#1\endcsname }{\ignorespaces #2}}%
-		\begingroup %
-			\@parboxrestore %
-			\if@minipage %
-				\@setminipage %
-			\fi %
-			\normalsize %
-			\@makecaption{\csname fnum@#1\endcsname }{\ignorespaces #3}%
-			\par %
-		\endgroup
-	}
-
-	\def\@makecaption@table#1#2{%
-		\addvspace{\belowcaptionskip}%
-		%\sbox\@tempboxa{{\bf #1.} #2}%
-		\small{\bf #1.} {\it #2}\par%
-		\addvspace{\abovecaptionskip}%
-	}
-
-	\def\@makecaption@default#1#2{%
-		\addvspace{\abovecaptionskip}%
-		\sbox\@tempboxa{{\it #1.} #2}%
-		\ifdim \wd\@tempboxa>\hsize%
-			\small{\it #1.} #2\par%
-		\else %
-			\global \@minipagefalse \hb@xt@ \hsize {\hfil \box \@tempboxa \hfil }%
-		\fi %
-		\addvspace{\belowcaptionskip}%
-	}
-
-	\renewcommand{\@makecaption}[2]{%
-		\expandafter\let\expandafter\hej\csname @makecaption@\@captype\endcsname%
-		\expandafter\ifx\hej\relax%
-			\let\hej\@makecaption@default%
-		\fi%
-		\hej{#1}{#2}%
-	}
-}
-
 
 % ============================================
 %              Package fixes
@@ -751,6 +706,7 @@
 	}{\providecommand{\phantomsection}{}}
 }
 
+
 % ============================================
 %             Table of contents
 % ============================================