Full update

Cleaned up all files