Almost at final Commit

Useless Code Removed. Modified some code flows