removing more stuff
final commits before trying to merge
final commits before trying to merge