Commented out many useless tables and alterations