Fix some goofs and removed useless stuff