Removing statics and fixing stuff