Removed unused adapter and updated lapclass