Removed header file / some code around