Removed dead weight...