removed some unnecessary shit! - added rules to avoid that shit in the future