Deleted bullcrap out of the main file