Removed unnecessary libs and updated templates