Removed includes and code vestigia