Removed some unused lines + usings