Removed stupid cap fixes