Code cleanup, removed useless variables/options