Removed not used stuff