Removed headers as they are already in .h