Finished. Removed some unused parts of code