Cleaned up buildfiles