fixing build process and cleanup