Removed some superfluous things no needed.