Updated to 3.02
-Removed redundant code