unnecessary code snippets removed